Only connect to the event if we have a frame, since the handler is only

2006-01-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkwindow.c: Only connect to the event if we have
	a frame, since the handler is only relevant in that case.

diff --git a/ChangeLog b/ChangeLog
index ec8845d38f4ab1c716715e90552e90aa0b6ea399..46413bae2b1b5a112ea45c485edd0ba2769e0607 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-01-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkwindow.c: Only connect to the event if we have
+       a frame, since the handler is only relevant in that case.
+
        * gtk/gtkaction.c (connect_proxy, disconnect_proxy): 
        Use a weak reference rather than the destroy signal to track 
        proxies going away.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ec8845d38f4ab1c716715e90552e90aa0b6ea399..46413bae2b1b5a112ea45c485edd0ba2769e0607 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-01-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkwindow.c: Only connect to the event if we have
+       a frame, since the handler is only relevant in that case.
+
        * gtk/gtkaction.c (connect_proxy, disconnect_proxy): 
        Use a weak reference rather than the destroy signal to track 
        proxies going away.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 520f03eb683c8fea51a746d54dc6f25479bebd3c..e605f08bb7a0c8186feffbaf4bfb69d4c007ec45 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -826,10 +826,6 @@ gtk_window_init (GtkWindow *window)
 
   gtk_decorated_window_init (window);
 
-  g_signal_connect (window,
-                   "event",
-                   G_CALLBACK (gtk_window_event),
-                   NULL);
 }
 
 static void
@@ -4261,6 +4257,11 @@ gtk_window_realize (GtkWidget *widget)
       attributes_mask = GDK_WA_X | GDK_WA_Y;
 
       parent_window = window->frame;
+
+      g_signal_connect (window,
+                       "event",
+                       G_CALLBACK (gtk_window_event),
+                       NULL);
     }
   else
     {
@@ -6033,7 +6034,7 @@ gtk_window_expose (GtkWidget      *widget,
  * frame_event you can receive all events targeted at the frame.
  * 
  * This function is used by the linux-fb port to implement managed
- * windows, but it could concievably be used by X-programs that
+ * windows, but it could conceivably be used by X-programs that
  * want to do their own window decorations.
  *
  **/